From 1ce47e367f0fd7ccbadfe5f9bea688c23f3924e2 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Mon, 3 Jul 2006 09:11:49 -0600 Subject: [PATCH] [IA64] add the definition of __cacheline_aligned and its variants Signed-off-by: Isaku Yamahata --- xen/include/asm-ia64/config.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h index 2749db7318..39c7653519 100644 --- a/xen/include/asm-ia64/config.h +++ b/xen/include/asm-ia64/config.h @@ -139,17 +139,19 @@ extern int smp_num_siblings; #define platform_outw __ia64_outw #define platform_outl __ia64_outl -// FIXME: This just overrides a use in a typedef (not allowed in ia64, -// or maybe just in older gcc's?) used in timer.c but should be OK -// (and indeed is probably required!) elsewhere -#undef __cacheline_aligned -#undef ____cacheline_aligned -#undef ____cacheline_aligned_in_smp -#define __cacheline_aligned +#include +#ifndef CONFIG_SMP #define __cacheline_aligned_in_smp -#define ____cacheline_aligned +#else +#define __cacheline_aligned_in_smp __cacheline_aligned +#endif + +#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) +#ifndef CONFIG_SMP #define ____cacheline_aligned_in_smp -#define ____cacheline_maxaligned_in_smp +#else +#define ____cacheline_aligned_in_smp ____cacheline_aligned +#endif #ifndef __ASSEMBLY__ #include "asm/types.h" // for u64 -- 2.30.2